Fix logical errors in gtk_list_store_move_before/after(). (#150983, patch

Wed Aug 25 00:09:07 2004  Søren Sandmann  <sandmann@redhat.com>

	* gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical
	errors in gtk_list_store_move_before/after(). (#150983, patch by
	Robert Ögren).

diff --git a/ChangeLog b/ChangeLog
index b45fe1e6deab9c11828c21fdb1365e2a45f2a3dc..7a07fee53f186a73362b1aa5c512ffb0a596f9b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,8 @@ Wed Aug 25 00:22:48 2004  Søren Sandmann  <sandmann@redhat.com>
 Wed Aug 25 00:09:07 2004  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical
-       errors in gtk_list_store_move_before/after(). (#150159, Robert
-       Ögren).
+       errors in gtk_list_store_move_before/after(). (#150983, patch by
+       Robert Ögren).
 
 Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b45fe1e6deab9c11828c21fdb1365e2a45f2a3dc..7a07fee53f186a73362b1aa5c512ffb0a596f9b2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -5,8 +5,8 @@ Wed Aug 25 00:22:48 2004  Søren Sandmann  <sandmann@redhat.com>
 Wed Aug 25 00:09:07 2004  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical
-       errors in gtk_list_store_move_before/after(). (#150159, Robert
-       Ögren).
+       errors in gtk_list_store_move_before/after(). (#150983, patch by
+       Robert Ögren).
 
 Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b45fe1e6deab9c11828c21fdb1365e2a45f2a3dc..7a07fee53f186a73362b1aa5c512ffb0a596f9b2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -5,8 +5,8 @@ Wed Aug 25 00:22:48 2004  Søren Sandmann  <sandmann@redhat.com>
 Wed Aug 25 00:09:07 2004  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical
-       errors in gtk_list_store_move_before/after(). (#150159, Robert
-       Ögren).
+       errors in gtk_list_store_move_before/after(). (#150983, patch by
+       Robert Ögren).
 
 Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b45fe1e6deab9c11828c21fdb1365e2a45f2a3dc..7a07fee53f186a73362b1aa5c512ffb0a596f9b2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -5,8 +5,8 @@ Wed Aug 25 00:22:48 2004  Søren Sandmann  <sandmann@redhat.com>
 Wed Aug 25 00:09:07 2004  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtkliststore.c (gtk_list_store_move_after): Fix logical
-       errors in gtk_list_store_move_before/after(). (#150159, Robert
-       Ögren).
+       errors in gtk_list_store_move_before/after(). (#150983, patch by
+       Robert Ögren).
 
 Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>
 

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index df29412c7a12bc9d91accdd2b87ffe2ff096cccc..9146168b7c7b99ba1e308c11bbe274d3cb949d71 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1550,7 +1550,7 @@ gtk_list_store_move_before (GtkListStore *store,
     g_return_if_fail (VALID_ITER (position, store));
 
   if (position)
-    pos = _gtk_sequence_ptr_get_position (iter->user_data);
+    pos = _gtk_sequence_ptr_get_position (position->user_data);
   else
     pos = -1;
   
@@ -1583,7 +1583,7 @@ gtk_list_store_move_after (GtkListStore *store,
     g_return_if_fail (VALID_ITER (position, store));
 
   if (position)
-    pos = _gtk_sequence_ptr_get_position (iter->user_data);
+    pos = _gtk_sequence_ptr_get_position (position->user_data) + 1;
   else
     pos = 0;